fixed brakeman issues
Merge pull request #246 from jasnow/fix_brakeman_issues

Fix brakeman issues