Merge pull request #561 from FransTwisk/front-end

Front end