Updates
Merge pull request #43 from datboitom/updates

Updates