Merge pull request #1 from paulegan/update

Updates
Merge branch 'update'