resolve #139
Merge pull request #153 from jhaynie/master

resolve #139