Merge pull request #1 from Jermolene/master

Update