Changed version to 2
Merge branch 'dev'