Avoid Full Path Disclosure.
Merge branch 'issue-47' into develop Closed #47