Merge pull request #1 from tgerla/master

Some minor stylistic changes and text editing.