fixed option names
Merge branch 'development'