Fix for MB-828
Merge pull request #121 from sperera/master

Fix for MB-828