Various bugfixes
Merge branch 'master' of https://github.com/wmontg2/wordPuzzle