Typos fixed, resolves issues #3 and #4