Release 6 into dev

see #46.