erics commit
Merge pull request #4 from alexabbott/ericsbranch

erics commit