Pull request for new features

Config options and command arguments, yay!