Small adjustments ...

see here our (draft) best-practise guide for more information: https://docs.google.com/document/d/1z3u0R4P8PAyc0660FUFgGEXRUg3gI6OrM1iQ_EOpG1g
Merge pull request #2 from bgruening/patch-2

Small adjustments ...