Merge pull request #26 from codepiano/master

continue 2013/12/21
translating daily patch dec 22
continue 2013/12/22