Fix gradle
Merge pull request #1 from krt16s/master

Merged. Small modifications to made to master repo for build versions.