Addressed issue #166