Merge pull request #108 from jialinsun/0.3.3.0

Fix issue #20