commented code in GitLocatoin
Merge origin/master