Merge pull request #76 in master
Happy New Year! update copyright year to 2014
Merge pull request #83
Merge pull request #83 in develop