Merge branch 'master' of heroku.com:lunarshift
made try cases to not break code
fix try case
fix try case