Closes #54
#57