Merging razum2um master

to hopefully achieve the spirit of #217