better design of main function
Merge remote-tracking branch 'origin/master'