Merge pull request #34 from BryanSalas/master