Pull Request from Phan, Trang

Please pull this fork with all 5 of my commits now.