further development no spice
Merge origin/master