Fixed import error
Merge branch 'dev' into examples