Various changes
Merge branch 'master' of git://github.com/johanss4/KardKit