Merge pull request #61 from gades/master