Merge remote-tracking branch 'refs/remotes/upstream/master'
Improved the use of "file_exists"
Merge pull request #8 from JN-Jones/development

Merge pull request #8 from JN-Jones/development