Removed global declaration
Merge branch 'dev'