Merge pull request #1 from pyve/master

Update my fork