Merge pull request #27 from skull132/master

Uniform fixes
Merge pull request #32 from Aurorastation/development

Update 0.1.5
Merge pull request #34 from Sgtsammac/development

Asteroid Map Attempt 2
Merge pull request #38 from Aurorastation/master

Updating dev branch