improved ident parsing
v0.6.1