removed obsolete parameter
Merge branch 'development'