updated for 2014
Merge pull request #32 from FenrirUnbound/patch/2014

updated for 2014