closes #355
closes #355 and closes #354