Issue #100
Merge branch 'master' of https://github.com/Ivan-Zhukau/conforg-desktop.git