GUI 0.98c
Merge remote-tracking branch 'aidv/master'