Merge pull request #30 from olevole/master

merge pull request