Merge pull request #155 from cjolif/master

Various enhancements & cleanups
fixes #156
Merge pull request #157 from cjolif/bugfix

fixes #156
Merge remote-tracking branch 'upstream/master'
improve paramater naming