closes #76
closes #77