Merge pull request #39 from gades/master