Merge pull request #9 from daneoshiga/master