Merge pull request #127 from gioman/master

fixes and string fixes
Added piwik support
More fixes from Nicolas
Fix to piwik