Added version information. Now accessible with the -v option.
Merge remote branch 'origin/master'