Merge branch 'master' into devel
got spec working by exporting more stuff