Closes #51, closes #52