Merging last changes
speakers module
speakers module
Merging branches