Remove the need to be specific about file paths. fix #9