fixed bug with freq
Merge origin/development into development