Merge pull request #1 from eduard93/master

Update