Update from_superd111
Merge pull request #2 from superdhuang/master

test123