Merge pull request #49 from l1m5/master

Fixes for Bubble Infinite Loop