removed two arguments from printf function call
added a comment for the first argument
changed comment for first argument to printf
merged some_branch with master; manually resolved merge conflict