fixes #542
Merge pull request #544 from eliantor/master

fixes #542
fixes #541
Merge pull request #545 from eliantor/master

fixes #541
fixes #546
Merge pull request #547 from meiti/master

fixes #546
expose abort object
Merge branch 'master' of github.com:baasbox/baasbox
Merge branch 'master' into watchers