fixed #161
Merge pull request #172 from jcotrel/master

fixed #161