add all changes
merge
test fix
merge
Merge pull request #70 from Hendrixer/master

added all changes, same as heroku