Fixing a few very dumb mistakes
Merge branch 'master' of https://github.com/ayes/bsmapp