continue 2013/12/20
Merge pull request #25 from codepiano/master

continue 2013/12/20