Merge branch 'dev' - version 1.0