Changes for mysql 5.6
Merge pull request #31 from jurgendb/master

Changes for mysql 5.6