Fixes callback being called to early
Fixes spacing/tabs
Merge pull request #1 from carcer/master

Fixes callback being called to early