Updates
Merge pull request #1 from chrismlusk/master

Updates