Updates
Merge pull request #19 from daven009/master

Updates