changes to the main.c
Merge branch 'flags'