Initial work on the --patch flag.
merging patch work
Adding more includes and default to 3.1.0