Merge pull request #1 from PhantomPhreak/develop

Develop