Addressed issue #3