closes #57