added preemphasis (not calculated though)
Merge branch 'preEmphasis'