WIP: Map marker sets, work in progress
Merge pull request #1 from wernerkrauss/3.1

Fixes for 3.1
ENHANCEMENT: Added composer
Update README.md