Elena's first commit
Merge pull request #2 from alexamster/elena5

Elena's first commit