fixes #119
Merge pull request #120 from tb/master

Merge #120 to address #119