Merge Issue #6