Adding test to verify that the module can be used with deferred
Bugfix, so that it can be used with deferred
Merge branch 'hotfix/0.1.1'