Merge pull request #5 from jegonzal/master

Merging upstream changes