fixed with map
Merge branch 'master' of https://github.com/torandersson/webbyraer
merge
small changes
fixed
merged