Added main function
Merge branch 'develop'