Merged develop into master

New version for new tag