Merge pull request #22 from tobiasandersson/master

add mapping
fix crash at startup