joe's v1
michael forgot to commit
Merge branch 'master' of https://github.com/immesys/pecs