#17 fix pull request

Somehow I cannot get away from including gdi2290 chage of copyright year and my #44 fix here but hope that'll merge fine and then I'll just force-sync my master to yours and will develop features only in branches, using master only to downstream things from you.