Issue #1 in CHANGE_LOG completed.
Issue #2 in CHANGE_LOG completed.