Addressed issue #63