addresses issue #118