Merge pull request #5 from Pyriana/mapwork

Mapwork