Issue #46
Issue #43
Merge branch 'master' of git://github.com/2ga/exp1
Merge pull request #46 from hiroto-exp2/master

#46