Merge https://github.com/vino80/EJBAppln