Merge pull request #4 from oisy/zhh

Zhh
Duplicated rates
modified
solve conflict