Merge pull request #10 from TehporP/master

Fix