Added proper data output
Merge branch 'taskTwo'