Merge pull request #24 from nebula2d/master

A bit of code cleanup.