OrsV

Hm, I might have created a duplicate for this with #113 if so we could just mark that as such. Not sure how easy it would be to bring that...