Merge pull request #56 from XhmikosR/master

Copyright year bumped, formatting fixes.