fixed --combine option to join the files
change if to elif
Merge branch 'master' of github.com:mingxiao/gp-test