Merge pull request #6 from SOSTheBlack/master

Merge Develop
Merge pull request #7 from SOSTheBlack/develop

Merge pull request #6 from SOSTheBlack/master