Extracted default settings to constants
Removed unused parameters
Merge branch 'master' into dev