Merge pull request #7 from ManagedPixels/develop

Develop