Typo. Merged changes from trodrigues