Merge pull request #18 from matejmosko/patch-2