some progress
Merge branch 'master' of https://github.com/robert-schmidtke/dtp