submitting for code review later, gotta run
reviewed and tested, queues changes
Merge pull request #10 from thesoftwarejedi/dev-tsj

Dev tsj