Discussion quick changes by Ivo.
Merge pull request #1 from dWarf-In-thE-FlaSk/NewBranch

Discussion quick changes by Ivo.