Add some fency logic to have it more simpler
Merge branch 'master' of https://github.com/rysiekblah/android-commons