Fixed error reporting
removed extra if statement
fixed filepath
tidied up filepath
Merge pull request #4 from rpelger1004/test

Test