Updates on the current situation
Merge pull request #1 from Accommodavid/master

Updates on the current situation