merge changes from adriano