Merge pull request #258 from moneymanagerex/gabriele-v_dev

v1.1.1 into master