Merge pull request #328 from moneymanagerex/stef145g_dev

fix(bugs): refer to commit comments