Merge pull request #53 from ii-BLACKREAPER/master

stuff
fixed the moving AGAIN.
Merge pull request #54 from WClement/master

fixed the moving AGAIN.
Merge remote-tracking branch 'upstream/master'
Merge pull request #55 from ii-BLACKREAPER/master

added to map
Merge remote-tracking branch 'upstream/master'
new map