More features
Merge branch 'master' of https://github.com/quarian/spawncamping-bugfixes