Merge pull request #51 from sbrunner/copyright-year

Update copyright year
Remove trailing white space, replace tab by spaces
Forward Cookies