Merge branch 'develop', remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Fix wrong class variable name
Merge pull request #65 from jtorresfabra/fix_lod

Fix lod