Merge pull request #1 from jtenner/master

Apply changes