Merge pull request #11 from BryanSalas/master