issue #773 (still nedds to replace GUI files with the ones from bender)
Merge branch '773' into develop