Update main.c
Merge branch 'develop' into new_branch