Updated to reflect changes from #85