Merge pull request #6 from tt185581/teimo

Teimo
Merge pull request #7 from tt185581/teimo

Teimo
Merge pull request #8 from tt185581/teimo

add changes for heroku