Merge remote-tracking branch 'origin/woocommerce'
Merge pull request #2 from leoken/master

Merge remote-tracking branch 'origin/woocommerce'