Merge fix #1