Merge pull request #30 from BryanSalas/master