Issue 16
Merge branch 'master' of https://github.com/BertBeentjes/bPAD.git
Issue 6