continue 2014/1/1
Merge pull request #34 from codepiano/master

continue 2014/1/1