Merging Haggard's changes
Merge pull request #1 from NicholasEM/haggard_updates

Merging Haggard's changes