Merge pull request #1 from lukelex/master

Update