update shaker
Merged 'dev'.
Finish gui