V0.6.1 with a fix for #1