Remove unnecessary extension
Fix line movement by predicate (goWhile)
Merge branch 'master' into temp