closes #194
closes #195