Fixing merge issues
Merge branch 'zuehlaa-typos' (PR #9)