Merge pull request #1 from Rockfordal/master

Updates