mapping progress
Merge pull request #24 from tobiasandersson/master

mapping progress