Merge Develop in Master

Shouldn't this `0.0002` fee be a constant?