this fixes #50, #51
new version