Merge branch 'bug_167_bsbe2_tone_amplitude'