Merge pull request #27 from codepiano/master

continue 2013/12/22
translating dail patch dec 23
continue 2013/12/23