Spezi stable

Hi hany,
I have used your master branch now to add the missing commits.
Cheers!