Merge pull request #14 from prsnca/master

updates fron Yaron
Heroku DEBUG=false
Merge pull request #16 from itayB/master

pull updates