inc version
Merge branch 'master' of github.com:MrTravisB/dorothy
Merge branch 'master' of github.com:MrTravisB/dorothy
Add shutdown callback and timeout option
Only throw exception if in debug mode