Callback fix
Merge pull request #6 from JHaun/FirstFixes

Callback fix