bumped and fixed copyright years, closes #664
merge a2786956156681a03c1878167ec007a2a24ea5bd