commented everything
Merge branch 'dev'