Merge branch 'master' of https://github.com/lpommers/1508-Explore