Merge fix for issue #100