Merge pull request #14 from Factionwars/master

Dev up to speed