commit by Rosana
Merge https://github.com/ajnebro/Riatec2013
Merge https://github.com/ajnebro/Riatec2013