Spartam

Merge branch spartam after multiple issues have been fixed