changes made to main.c
Merge branch 'flags'