merge all the things!!
Merge branch 'js-dev' of github.com:taktran/ttpp into js-dev