Rebased
Merge pull request #57 from gamelost/zone-detection

Added zone detection. Hack-ish for now until server passes the zones in ...