Merge pull request #11 from CandyCurt/xmas-2013

Xmas 2013