#58 & #59 Fixed output examples