Updated shiny again. Some recent changes were accidently overwritten by eduard on 12/30/2012