changes
Merge pull request #1 from ktrottier/new

changes