Minor
Merge remote-tracking branch 'origin/master'
Changed IntegerFields to PositiveIntegerFields
Restrained most floating point values to positive.