Updated main class
Merge branch 'develop'