renamed type
daily update
another merge
Merge pull request #20 from TrentBartlem/master

another merge