Merge pull request #583 from FransTwisk/front-end

Front end