Fixing types
Merge pull request #1064 from jdalphon/FixingTypes

Fixing types