Merge pull request #2 from dkrnl/master

merge