merge Judy's changes and restore proper file location
Merge pull request #5 from sharocko/bug-reporting

merge Judy's changes and restore proper file location