Adding last minute changes added by apennell
Merge pull request #23 from ryanwilsonperkin/last-minute-changes

Adding last minute changes added by apennell