* This should close Issue #3 and Issue #2