Close #18
Merge pull request #20 from akeeba/feature/18-DNT-issue

Close #18