Upgraded commons-cli to v2.0