Power-ups issue #12

Fixing uncommited changes