issue 72, 73 and some very small fixes
Merge branch 'master' of https://github.com/BertBeentjes/bPAD.git