Merge pull request #1 from oheric/ericsbranch

erics commit
Merge pull request #2 from oheric/master

Merge pull request #1 from oheric/ericsbranch