solved #4
Merge pull request #5 from melissavlin/master

solved #4