cp: first passing test
Merge branch 'master' of github.com:cjpollard/plapp