Merge pull request #593 from FransTwisk/front-end

Front end