Merge pull request #16 from jeromekelleher/werkzeug-support

Werkzeug support
Merge branch 'master' into variantsets