Merge of master

Testing the GUI method of merging forks