modifications on d/pr01
Merge pull request #3 from smetsth/d/pr01

D/pr01 into work