Commit winter2014 code