Merge pull request #2 from GarageGames/development