Completed update as described in Issue #1