Merge pull request #116 from rosiel/7.x

7.x