Added some shiny stuff
Merge pull request #30 from bcaffo/master

Added some shiny stuff