Fixing main function for errors
Merge branch 'master' of git://github.com/dolle39/test-repo