Merge pull request #2 from Alphapixels/master

Updated codebase
Merge pull request #4 from Alphapixels/experimental

Merge pull request #2 from Alphapixels/master