fixed activity warning issue
Merge branch 'master' of https://github.com/tw-step/UNO