Merge pull request #1 from fratac/master

Update