continue 2013/12/22
Merge pull request #27 from codepiano/master

continue 2013/12/22