Minor changes
Merge branch 'master' of https://github.com/brawn/pump_up_the_jam

# By MIchael LeGrand
# Via MIchael LeGrand
* 'master' of https://github.com/brawn/pump_up_the_jam:
  Fix for some broken logic.