Merge pull request #22 from TracyWebTech/master