ga metrics; closes #39
closes #42
Merge branch 'master' into production

* master:
  closes #42
  ga metrics; closes #39