Corrected for #17 and #18 minor edits