a few bug fixes
Merge branch 'master' of https://github.com/Nick-Kontos/Whiteboard.git