added content for module2
Merge branch 'master' into module2