in class
Merge pull request #1 from juliemessier/master

These are my changes
Merge pull request #1 from placebo1755/master

TryTry