Merge pull request #27 from castomer/bugfix

Bugfix
Merge remote-tracking branch 'upstream/master'
adjust rails app deploy