Better mapping
Merge branch 'master' of github.com:konzilo/konzilo_kickstart