Merge pull request #2 from ricardojmendez/master

Update master branch from upstream
Merge pull request #3 from attrition/master

Update dev from master