Add changes as suggested in Issue #2