Merge pull request #2 from codegourmet/output_options

Output options