Merge commit?
Merge pull request #1 from iApocalypsee/dfix

Daniels version will be used as backup for now.