Update Year
Merge remote-tracking branch 'upstream/dev' into dev
Change git version
Merge pull request #43 from dterweij/dev

Change git version