Updated 8.x branch
Merge pull request #1 from jazio/master

Updated 8.x branch