Merge pull request #24 from ryanjsalva/patch-1