Merge pull request #124 from Bohdan-Tereta/development

Issue #121 fixed
Merge pull request #125 from Bohdan-Tereta/development

Issues #120, #122 and #123 fixed
Issue #126: Sort by From/To ... doesn't work fixed
Merge remote-tracking branch 'upstream/development' into development