Merge pull request #1 from mogelbrod/new-design-for-2014

New design for 2014