CLI compability added. Default values added. Needs more tweaking and JUnit tests before release.