Some thoughts, changes, nothing too substantial
Merge pull request #559 from remu5/patch-1

Some thoughts, changes