Closes #57