Updates
Merge pull request #18 from daven009/master

Updates