Merge branch 'hotfix/fix_for_issue_17'
followed latest version of build tools.
Merge branch 'hotfix/gradle_plugin_0.9.+' into develop