Erik changes
Merge pull request #1 from friesendrywall/master

Erik changes