Merge pull request #1 from Lord-Simon/master

Updates