test and fixed #136 and #137
fixed sth
Merge pull request #386 from sherlock917/master

test for #136 and #137, ready for review