Runes2

Hi Sergi, this is the runes branch rebased on the current master of your repo. (That may not have been the cleanest way to fix matters ... sorry, I'm a bit new to this.) I hope this merges cleanly for you.