little bugs fixed,
further development do spice
Merge origin/master