Merge fix #96