Few new modules
Merge branch 'f-modules' into dev
Merge branch 'dev'