more learning
Merge pull request #4 from marinamarina/dev

more learning