Merge pull request #83 from dmp42/refactor

Refactor, take 2
update copyright year to range
Merge pull request #84 from gdi2290/patch-1

update copyright year to range