clarify logic
Merge branch 'master' of github.com:danmartelly/SugarRush