add module 2 and 3
Merge branch 'dev'