Merged some things from other branches...
I don't know what I did.
Merge pull request #2 from texastony/AlphaTony846

Alpha tony846