Revert "Merge pull request #260 from Gonthim/master-CLI-Arguments"

This reverts commit bb3b689efd1f8b231ec363f8c5f75d2160196141, reversing
changes made to 4b02ed973606f6fb4d348f22684499de831669c9.
Revert "Merge pull request #249 from Gonthim/master-CLI-Arguments"

This reverts commit f6864033ebd9475c667b7a7143ed4b20fa13c375, reversing
changes made to 0f5a241fe2d8055f56080c06833feea78c7150c7.