garbage comments removed
Merge branch 'master' into develop