fix 134
Merge pull request #58 from juniwang/master

fix https://osslab.atlassian.net/browse/LAB-134