Updating the initial code
Merge origin/master