Pull request to master

I ran it on a separate loop due to an interaction I was testing on NSTimers.

Merged and tested. Game is working fine.