Addressed issue #1