closes #87
closes #87