Merge pull request #1 from jlord/master

Update from original