Added missing files
Merge branch 'dev' into test