Merge pull request #304 from quidryan/master

Clean merge with gradle-template