Add free class to gui/src
Merge origin/master