Merge pull request #1 from vsanchez1987/victor

Victor
merged with master