Cuurent upstream version

Merge pull request #12 from gcauchis/master

Add possibility to customize the gauge type