Merge pull request #24 from nebula2d/master

A bit of code cleanup.
Merge pull request #25 from nebula2d/development

Merge pull request #24 from nebula2d/master