Merge pull request #6 from dkrnl/master

merge