Merge branch 'getopts' into version
Add support for "version" flag