Merge pull request #6 from SOSTheBlack/master

Merge Develop