Fixed a bug of adding tones
Merge branch 'devel'