Updating the Master branch with the current Dev. branch