Quick fix for issue #80
Merge pull request #81 from lucarnu/master

Quick fix for issue #80