closes #61; closes #51