erics commit
Merge pull request #1 from oheric/ericsbranch

erics commit