Optimize drawing

should fix #68

@mattn I changed the custom matcher part a bit. Can you please test?