added requested info
Merge pull request #7 from erikapierr/master

added requested info