Integration fixes
Merge branch 'master' of github.com:alvinlao/GummyBears