Merge pull request #7 from gregorg/master

Compatibility with MariaDB 10