adding type to deal 2
fixing merging
Merge pull request #5 from albertlb/deal_with_type

Deal with type