Addressed issue #94