setup
Minor bugfixes and tests
Merge branch 'master' of https://github.com/trokster/xcayp