Merge pull request #1 from elmer-garduno/master

update from upstream
Bug fix in model object conversion.

Fix to convert the correct set of info key/value pairs from the model objects.
Merge pull request #2 from deflaux/master

Bug fix in model object conversion.