commit 06-12-2014 - Adriano