Merge pull request #35 from hiroto-exp2/master

#20
Issue #21
Merge branch 'master' of git://github.com/2ga/exp1