Merge pull request #98 from nairys/credit

Credit
tweaked algorithm
Merge pull request #99 from nairys/fix_analytics

tweaked algorithm
fix button
Merge branch 'master' into credit