[FIX] GUI, Closes #936
Merge branch 'stable'