prepare for mocha testing
Merge branch 'develop' of github.com:XadillaX/Toshihiko into develop