updates concerning issues #88 and #87