Merging development branch to master with latest changes