Merge pull request #73 from cjmcgraw/master

Merge TI22 branch with master
Merge pull request #74 from cjmcgraw/master

Update Ti22 with master branch
Merge pull request #75 from cjmcgraw/ti22

merge Ti22 with master to update both branches