Lots of changes, you are definitely going to want to pull again
Merge pull request #1 from crimson16/ty-branch

Lots of changes, you are definitely going to want to pull again