Create test
setup
Merge https://github.com/trokster/xcayp into version2
Merge remote-tracking branch 'upstream/version2' into version2