Merge pull request #15 from Sara-lily/master

Resolved conflicts