Some cleanup in the wrapper, and integration tests.
Merge remote-tracking branch 'remotes/origin/master' into ENGINE-576
Merge pull request #15 from evrythng/ENGINE-576

Engine 576