continue 2014/01/18
Merge pull request #35 from codepiano/master

continue 2014/01/18