Merge pull request #608 from FransTwisk/front-end

Front end