sub dir synching
Merge branch 'master'
comment updates
Merge branch 'master'