fixed start
Added comments
Merge branch 'product_feature'