Merge pull request #2 from ngzax/master

Update with latest from upstream