Merge pull request #35 from gregorg/master

Compatibility with MariaDB 10