typos corrected
minor edits
merge