Addressed issue #4