Added Code module
Merge branch 'master' into dev