Little changes made
Merge branch 'master' into currentSituation