Bug Fixes and Improvements
Merge branch 'master' of github.com:imZack/pebble-uber