Merge branch 'master' into dev-map
Add getValues()
Merge branch 'dev-map' into dev-fak
Working implementation