further development do spice
Merge origin/master