Merge pull request #4 from eduard93/master

Update