reliablility improvement
Merge pull request #48 from Yaliang/master

reliablility improvement