Merge branch 'dev' - V1.0