Addressed issue #1.