Merge pull request #4 from dkrnl/master

merge