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

update
Merge pull request #7 from Borderline-Insane-Studios/master

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