closes #79
closes #76