Merge pull request #3 from chansuke/master

several changes