changes made by rebecca
Merge pull request #13 from ffrensch/master

changes made by rebecca