Added changes from master branch into reverberation