Fix issue #16
Enhance generation
Merge develop
Merge branch 'install' into f_cliparams_#16
Finish #16
Merge pull request #19 from mandraWorks/f_cliparams_#16

F cliparams #16