missing library
Merge branch 'master' into beta