continue 2013/12/21
Merge pull request #26 from codepiano/master

continue 2013/12/21