Dev to master

Should be merged into master; its about time.
I wonder if `%<->%` looks better