Merge pull request #34 from moonbingbing/master

Thank you very much