Added missing semicolon
Merge branch 'dev'