Compatibility to 4.9
Merge pull request #6 from ecomstyle/master

Compatibility to 4.9