added missing parts.
Merge branch 'master' of https://github.com/conorpp/karxim