Closes #52