Issue 848

Fixed issue #848 and some typos