adapted for windows
Fixed semicolon after if statement.
Merge branch 'master' into teamB