jimmycuadra Merge pull request #8 from mortonfox/patch-1