fixed merge failure
Merge pull request #7 from lnxslackware/master

Fixed merge failure