fixed small stuff
Merge branch 'master' of https://github.com/underverk/SmartWatch