Merge pull request #17 from belgianman/development

v1.0.1 minor changes to merch handling