More options to rename for better inclusion in a project
Add a compilable example
Allow options without a long name

(Thanks to Jeff Hostetler <jeffhost@microsoft.com>