Version from -v and --version CLI switches
Merge pull request #875 from tremendo/fix-issue-848

Version from -v and --version CLI switches