Add --version command line argument
Print version in log on startup
Merge remote-tracking branch 'upstream/master'