Merge pull request #5 from dkrnl/master

merge