I'm doing fix little things.
merge rfrost
Merge branch 'master' of https://github.com/hongkunyoo/athere-android