fixes #25
fixes #32
bumb version