Merge branch 'master' into dev
more tests for missing functions
Merge branch 'dev'