Pull Request For Anthony Dwyer

Thanks for taking the time to look at my work.  If you do happen to find a bug, please let me know!