Refactoring for Gradle + lint fixes + release 2.0.1