added metrika and fixed #9
Merge branch 'master' into gh-pages