Added support for error callbacks
Updated gitignore
Added support for callback functions
Merge with master
Merge with master