Merge pull request #69 from nebula2d/master

resync