issue #71 edits