brgirgis Merge pull request #15 from Andrej730/patch-1