remove some semicolons :)
Merge branch 'master' into dev
update exception