closes #118

closes #116