Fix #333 Update Glokka from 1.6 to 1.7