Update to work with shiny 0.10.0
Merge branch 'dev'