update optional arguments : add short versions of the options
Merge branch 'yankuangshi-develop'

This closes #27.