Improving version control
Merge branch 'dev'