closes #309
closes #288