Merge pull request #2 from UARRR/master

Upstream changes