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