Added mapping
Merge branch 'master' of github.com:Portalen/Portalen