Final additions
Merge branch 'master' of https://github.com/ChasedSpade/SpadeServ