Already added this from #55, I hope this makes merging easier