Fixed warning
Added details
Removed unnecessary line
Added variables and modifiers
Merge branch 'dev'