Release 0.6.1 with two bugfixes