Manually merged in the details for #37  Closes #37