Merge pull request #8 from dkrnl/master

merge
Merge pull request #8 from Intecmedia/master

Merge pull request #8 from dkrnl/master