Merge pull request #535 from FransTwisk/front-end

Front end