Merge commits fixes and add OutputStreamWriter