finished credit
Merge branch 'master' into credit

doine with credit
Merge pull request #98 from nairys/credit

Credit