closes #255
closes #266