Merge pull request #14 from casidiablo/develop

Moved everything to Telly ✓