Merge pull request #9 from naoyat/master