Update for the time when using UBUNTU
Merge master of remote origin