Updates
Merge pull request #3 from tylersimko/tylerbranch

Updates