Merge pull request #2 from patrickarlt/feature-image-map-layer

Fix tests, pull latest from master