Changes for DeepListen
Merging branches