Merge pull request #14 from Zookal/master

Fixing Issues #11 #12
Merge remote-tracking branch 'upstream/master' into catalog_category_product

* upstream/master: