changes
Merge pull request #6 from trishfromtisch/master

changes