Merge pull request #8 from lae/master

Piwik tracking