Improved versioning to be automated
Merge branch 'development'