ticket 557
Merge pull request #22 from xiechao06/ticket557

ticket 557