Fixes for https://github.com/lexborisov/Modest/issues/15
Fixes for https://github.com/lexborisov/Modest/issues/15

lexborisov/Modest,lexborisov/Modest,vtorri/Modest,vtorri/Modest,vtorri/Modest,lexborisov/Modest,vtorri/Modest,lexborisov/Modest