Merge pull request #3 from openjaf/master

merging to develop
updates for heroku