My changes up to this point
Merge pull request #6 from ebarr/erinn

My changes up to this point