Fix for #244
Merge pull request #245 from embarknow/integration

Fix for #244