Merge pull request #1 from mmontequin/master

manufacturer, input file
fixed object
Merge pull request #2 from clungu1/Cosmin

pull from master
Merge pull request #3 from mmontequin/master

description of input file format