Merging the development branch to master (live)