Addressed issue #101