my computer resurrected so I'm pushing what I have
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project