Merge pull request #13 from hawesie/master

GUI update - summary code, slight clean-up