Merge pull request #9 from sogko/devel

Fix issue # 8 where exceptions thrown within the callback are swallowed up, causing test cases to seemingly pass even though it fails
Merge pull request #1 from triAGENS/devel

Merge pull request #9 from sogko/devel