Merge jhuriez fork

Merge changes from
https://github.com/jhuriez/magento-configurable-simple/commit/7321776d6c97e96f4cf120b33cf25d57fe5e614c
Merge barbazul fork

Merging
https://github.com/barbazul/magento-configurable-simple/commit/055aa7daf238eade6293f8635aec59a1c3238f6f
Merge pull request #2 from microchip/master

Request merge for two functionality issues