Erics Commit
Merge pull request #1 from eshalkowski/Eric

Erics Commit
merger