Merge pull request #5 from halfdan/piwik-compat