Merge pull request #66 from matejmosko/patch-2