Addressed issue #32