Addressed issue #37.