Bug fix: calling wrong class =(
Merge branch 'master' of github.com:professor/whiteboard