Revert "revert changes to master"

Reverts bmtreuherz/Brickbreaker#3