closes #57
closes #50