Merge playSound branch and master