issue #10 Done =)