Closes #54, Closes #57