Some fixes & compatibility to 4.7
Merge pull request #1 from ecomstyle/master

Some fixes & compatibility to 4.7