Closes #64, Closes #54