tlh Merge pull request #16 from bigjust/master