Merge pull request #1 from dkrnl/master

merge