Merge pull request #218 from diegofdz/master

Ok, merged.