commented not working lines
Merge origin/master