Fix issue #146
Merge pull request #148 from collective/issue_146

Fix issue #146