Merge pull request #11 from santiago-hollmann/fix/model-number-types

Fix/model number types

Merge pull request #8 from santiago-hollmann/develop

Merge develop into master