added help options
fixed pull errors
Merge branch 'master' of https://github.com/noahpc/WhiteCollar
fixed pull errors again