Fixed processing of command line parameters.
Fixed assertion.
Fixed assert.
Adapted to move constructors.