updates for 2014
Merge pull request #1 from mlindegarde/2014-update

updates for 2014