forgot include class
Merge branch 'master' into ubuntu