fixed #129
Merge pull request #170 from jcotrel/master

fixed #129