Merge pull request #577 from FransTwisk/front-end

Front end