Editing corrections on the last commit #cash-100
Merge branch 'origin/cash-137' into develop