Merge pull request #2 from Factionwars/master

Get up to speed