Merge pull request #42 from Eventalist/tdshap

Tdshap
boostrap sucks
Merge pull request #43 from Eventalist/yoshiemuranaka

boostrap sucks
added 2 apis
Merge branch 'master' of github.com:Eventalist/Eventalist into tdshap