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

Merging stable / working configuration to master