Merge pull request #2 from Alphapixels/master

Updated codebase