Partial fix for issue #80
Merge pull request #81 from jpav/master

Partial fix for issue #80