Merge pull request #601 from FransTwisk/front-end

Front end