Added the ability to provide a callback
Callback as a property of options
Merge branch 'Soutar-master'