Merge pull request #1 from dkrnl/master

merge
Merge pull request #1 from Intecmedia/master

Merge pull request #1 from dkrnl/master