Merge pull request #1 from alexaan/feature1

Feature1 merge
Merge branch 'master' of https://github.com/alexaan/spawncamping-ironman into feature2