explicit output flushing readded + need fix
Merge branch 'master' into intern