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

continue 2013/12/28