Merge pull request #2 from Dermenslof/dren

Dren