Merge pull request #1 from mindBeef/master

Changed map type