Merge pull request #2 from Orange-OpenSource/master

rebase