Preparations for Cakefest 2014
Merge pull request #6 from oldskool/master

Preparations for Cakefest 2014