Version 1.0.1: Improved commandline arguments