Initial code
Fixes for pull request
Merge pull request #1 from rspieldenner/gradle-2.2

Initial code