Merge pull request #30 from remie/develop

#25 :: Consistent naming of add-on