Merge pull request #9 from freidt/master

Explorer Integration