Merge pull request #2 from rtorr/develop

merge develop into master
fixing bug where callback was called but not implemented in fuctions using it
bumping up version
adding sanity test for watch
upmerged with master.
merged in hot_fix_callback_bug.
Merge branch 'master' into develop