merge from master& add gui entry (not working)
solve conflict