ticket 568
Merge pull request #25 from xiechao06/ticket568

ticket 568