- Merge branch 'master' into develop
- added namespace to the main class
- Merge branch 'develop'