Update 2

Made multiple corrections!
Merge pull request #1 from KostasVr/Update-2

Update 2