Merge branch 'hotfix/2.3.2' into Development
Minor changes. Non-important
Updated readme
Merge branch 'release/2.4'