r223 SVN - Changes by Leandro Conde