updates for #118 and #119 and cutting a new version