simplified a little
Merge branch 'master' of github.com:halabe/shiny-dangerzone