modified license text (copyright without years)
Merge branch 'master' into martin