type changes
Merge pull request #2 from adregan/master

Update