Fixes crash
Merge branch 'master' of github.com:dsgruss/herokuapp