Making this safer to run, and easier to read.
Merge pull request #1 from antoligy/patch-1

Making this safer to run, and easier to read.