changes concerning issues #80, #81, #82 and #83