Happy New Year! update copyright year to 2014
Merge pull request #44
Merge remote-tracking branch 'upstream/master'