Added config options, callbacks, code cleanup
version bump for release