Added way better file path support. Should make testing easier, as well as allowing you to run it anywhere else.
Merge remote-tracking branch 'origin/development' into development