merged with Tobi version
Merge branch 'master' of github.com:annaroes/blackboardLeap