zackfisher Merge pull request #14 from jepusto/patch-1