Now really fixed #23
Release 0.6.4