Addressed issue #120.