Merge pull request #25 from WClement/master

Merge pull request #3 from Runecat/master
mapbuilder
Merge pull request #4 from Runecat/master

s