bumped and fixed copyright years, closes #588
merge 6e2e398be581ed545e8f2f208381c610abf2b0a1