Refactor version 1.2.0
Merge branch 'master' of github.com:GGotardo/android-halley