improve robust
Merge pull request #3 from dgdn/master

improve robust