Merge pull request #103 from ccding/master

fix issue #92