Refactor by mmagnusek comments.
Merge pull request #1 from macejmic/product-variants

Product variants
Merge with master.