Add initialization
Merge branch 'dev'