Fixed case-sensitivitiness problems.
Fixed command-line option conflict.
Authored by: davidfange 2015-06-01
Parent: [r744]
Child: [r746]