Fixed a bug in the argument parser class.
Fixed failing unit tests.
Merge origin/master