Fix gradle build issues
Merge pull request #9 from lucasr/build-fixes

Fix gradle build issues