Merge branch 'master' into telescope-updates
Merge pull request #34 from weld-co/telescope-updates

Merge branch 'master' into telescope-updates