Adding a unique id
Merge branch 'master' of https://github.com/debianw/koboldmaki