Updates
Merge pull request #58 from jburnham96/master

Updates