Added better callback handling
Merge branch 'bug/issue_5'