ivelasq Merge pull request #93 from ivelasq/master