Add missing imports
Merge branch 'devel' to master
change package name for stable