Merge pull request #25 from codepiano/master

continue 2013/12/20
transalting daily patch dec 21
continue 2013/12/21