closes #198
closes #201