Added Akkerman function implementation
Fixed few tiny bugs