Fixes for issue #81.