Added help message and improved the option parser