heroku push
add some tests and bugfixes
after merge