several changes
Merge pull request #9 from chansuke/work

several changes