fix for Issue #2 and Issue #3
merge conflict