v 0.2.1 : Add credit & deduplicate code