GUI 1.0 RC2 /w comments
Merge remote-tracking branch 'aidv/master'