More debug info
5.0.4 Release changes
Merge pull request #491 from Grunthos/master

5.0.4