Merge pull request #1 from Parsely/master

Update from upstream