merge to Matthias's amazing EJS client