Fixed #803 thanks to @ninjalulz
Added a few maps from #1200
Fixed #825
Fixed #1212
Fixed ##1211
Merge pull request #1214 from EPuncker/master

Fixed #803 thanks to @ninjalulz