- Updating Beta
Merge branch 'Lance' into Beta
- Fixed Color