started commenting code
Merge origin/master
late sat