Merge remote-tracking branch 'origin/v8.0' into develop
Merge pull request #4 from etenesaca/develop

Merge remote-tracking branch 'origin/v8.0' into develop