Merge pull request #86 from wtogami/master