Merge pull request #3 from Borderline-Insane-Studios/development

First pull...
Merge pull request #5 from Borderline-Insane-Studios/master

Merge pull request #3 from Borderline-Insane-Studios/development