code refactoring
removed unused options
Merge branch 'working_branch'