Updates

Adding some code
Merge pull request #3 from epwalsh/Updates

Updates