override updates
Merge pull request #3 from emmairwin/7.x-dev

override updates