feature #82 : Merging with master and fixing some of the little bugs in the GUI