Merge pull request #8 from dkrnl/master

merge