Merged from feature/print and fixed conflicts