Add missing file header
Bump to version 3.1
Merge branch 'umaster'