refactor
comments
Merge commit '985bc840160dbca700515c2f3a23bffb8e13c932'
Merge branch 'my-maven2gradle-refactor'
This fixes #4 and #3