Adding changes from Alexis.
Merge pull request #1 from kyledemeule/alexis-temp

Alexis' work