Error message now includes the file and line number
Merge pull request #16 from wpreul/master

Error message now includes the file and line number