closes #198
closes #202