Closes #53 and #52