Fix issue #125
Merge pull request #126 from robertsmieja/dev-gradle

Fix issue #125