shiny! shiny!
Merge pull request #2 from kareandersen/master

Shiny!