Merge and close Issue #7