Command line options added.
Merge branch 'release/1.13' into develop