Updated docs & improved map handling
Merge pull request #4 from mMontu/master

Updated docs & improved map handling