Merge pull request #152 from jhaynie/master

fixed #151
Merge pull request #153 from jhaynie/master

resolve #139