Removed import hack
Updated SPEC file
Merge branch 'master' into testing