bug fixes
Merge branch 'master' of https://github.com/gbachik/battlefish

lol:w