refs issue #38
refs issue #38
Merge pull request #39 from tianyu0915/master

refs issue #38