Merge pull request #1 from VitalPet/7.0

7.0 merge with master