soninob Merge pull request #134 from aleitamar/master