Merge branch 'master' of https://github.com/krouge/Discover.git