more Eric updates... yay.
Merge pull request #7 from ktsweb1/master

More Eric Updates