alex changes
Merge pull request #1 from ttran289/alex

alex changes