Bring up to date with master and incorporate fix for Issue #26

This pull requests brings C&P's fork up to date with master and incorporates a useful fix for Issue #26 which I'm currently waiting to get into master which allows options to specify a set of allowed values and actually have those respected