Merge pull request #1 from pyve/master

Update my fork
Merge pull request #29 from fpalm/master

Merge pull request #1 from pyve/master