Merge pull request #30 from bcaffo/master

Added some shiny stuff
Merge remote-tracking branch 'upstream/master'