BF for issue #121
Merge pull request #123 from lukelalo/master

Fix for issue #121