Merge fixes
Merge pull request #13 from daniel-dgi/7.x

Merge fixes