Merge pull request #7 from x3ro89/master

Fixed issue #6