Merge pull request #101 from yasushi-saito/master