Fixing
Fixing conflit
Merge pull request #130 from lomamech/Fixing

Fixing