Remove not needed and commented source
Only add parameters to final file when set by option
Merge pull request #13 from i-net-software/pr/10

Pr/10