Updated to 0.5.0, added more commandline arguments