Merge pull request #6 from terribl/master

resetMap()

Did I manage to do this right? Let's try.
Merge pull request #8 from MalcolmRobb/master

Pulling in from MalcomRobb's Master
Merge pull request #9 from MalcolmRobb/master

Pulling in from MalcomRobb's master updates
Merge mapRefactor -> master
Merge mapRefactor -> master