closes #414
closes #409