Merge Issue #219