Merge pull request #1 from zefferno/master

Update