correct get main name
Merge branch 'issue-14' into develop