continue 2013/12/23
Merge pull request #28 from codepiano/master

continue 2013/12/23