Merging pull request from Matej