fix #270 and fix #268
Merge branch 'development' of https://github.com/pse4/orange-proton into development