Feature/semicolon