Some more updates
Updates again...
Merge pull request #3 from JakeGinnivan/Update

Update