Addressed issue #2