Fixed merge errors
Merge https://github.com/Naronco/Enco3D