added support for the -v and --version options
Merge branch 'version' into dev
Merge branch 'dev'