Fix #480 Update Glokka from 2.0 to 2.2